bitkeeper revision 1.1274.1.4 (425398d6dodQmT9FXdAh9slj1PTc4Q)

Reduce size of IRQ name arrays -- NR_CPUS not NR_IRQS.
Signed-off-by: Don Fry <brazilnut@us.ibm.com>
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c
index 70e0dbfdbf8624ff81f0fc22e0f3f59a42ac2ca7..117ca921501aefda699f145b32fd7a7a6a38e8e0 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c
@@ -444,7 +444,7 @@ static irqreturn_t ldebug_interrupt(
 }
 
 static DEFINE_PER_CPU(int, ldebug_irq);
-static char ldebug_name[NR_IRQS][15];
+static char ldebug_name[NR_CPUS][15];
 
 void ldebug_setup(void)
 {
@@ -1335,8 +1335,8 @@ extern irqreturn_t smp_call_function_interrupt(int, void *, struct pt_regs *);
 
 static DEFINE_PER_CPU(int, resched_irq);
 static DEFINE_PER_CPU(int, callfunc_irq);
-static char resched_name[NR_IRQS][15];
-static char callfunc_name[NR_IRQS][15];
+static char resched_name[NR_CPUS][15];
+static char callfunc_name[NR_CPUS][15];
 
 void __init smp_intr_init(void)
 {

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c
index 8f48fe23f3b4365bb59dc2c22945bf5a4888997d..826b93041f691bc284d10c6d3973d79cd5b2d1e9 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/time.c
@@ -762,7 +762,7 @@ void time_resume(void)
 }
 
 #ifdef CONFIG_SMP
-static char timer_name[NR_IRQS][15];
+static char timer_name[NR_CPUS][15];
 void local_setup_timer(void)
 {
        int seq, cpu = smp_processor_id();